git merge conflicts

join shbcf.ru